Merge pull request #116 from standard-for-public-code/jgroenen-patch-2

Merge pull request #116 from standard-for-public-code/jgroenen-patch-2 #261