Code fixes per Laurent Alebarde's review
Merge pull request #5 from hintjens/master

Code fixes per Laurent Alebarde's review