Clean up. Remove trailing whitespaces. Fixed a bit of mojibake.
Merge pull request #254 from ospalh/feature-cleanup-whitespace-mojibake

Clean up. Remove trailing whitespaces. Fixed a bit of mojibake.