Fix whitespace issues.
Merge pull request #175 from fk/fix-whitespace

Fix whitespace issues