Remove trailing spaces
Remove trailing spaces
Fix #25
Fix #26
Fix #28
Merge pull request #27 from eduardolundgren/master

Fix #26