Remove trailing spaces
Remove trailing spaces
Fix #25
Fix #26