Merge pull request #1 from cdodd/master

Strip trailing whitespace