Merge pull request #36 from hakre/master

Whitespace fixes.