Whitespace fixes
Merge pull request #30 from halorgium/whitespace-fixes

Whitespace fixes