Minor WS fixes
Minor WS indentation fixes
Merge pull request #13 from hakre/patch-4

Minor WS fixes