Whitespace cleanup
Merge pull request #4 from martinthomson/whitespace

Whitespace cleanup