Remove trailing whitespaces

This is a continuation of pull request #11 but made against the develop branch.