Fixes #46
Merge pull request #47 from harikt/issue-46

Fixes #46 -- also whitespace removal