Remove trailing whitespace and fix indent
Merge pull request #2 from tuxinaut/master

Remove trailing whitespace and fix indent