small changes for 1b
suggestions for 2b
Merge pull request #1 from fbkarsdorp/master

small changes for 1b