Fix whitespace / newlines
Merge pull request #2190 from yakky/feature/ws

Fix whitespace / newlines