Trailing whitespace sucks!
Merge pull request #1 from s10wen/master

Trailing whitespace sucks!