Whitespace fixes
Merge pull request #284 from hintjens/master

Whitespace fixes