hotfix
Merge pull request #147 from hannesvdvreken/master

hotfix
restore from bad merge conflict
whitespace