Whitespace fixes
Merge pull request #800 from awsiv/master

Whitespace fixes