Merge pull request #195 from akien-mga/cleanup-whitespace

Remove trailing whitespace