Whitespace cleanup + Fix for #46

I believe this fixes #46. I recently had the same issue. Explained in 727e6e1.