Trim whitespace
Merge pull request #1 from mathias/trim_whitespace

Trim whitespace