Simplified whitespace management #28
Merge pull request #29 from scampi/issue28

Simplified whitespace management #28