Trim spaces
Merge pull request #619 from camelmasa/trim-spaces

Trim spaces.