Merge pull request #9 from sydvicious/master

Bugs 1012833 and 1012855
Remove trailing whitespace.