fix spelling and remove trailing whitespace
Merge pull request #593 from josbrahol/fix-spelling

fix spelling and remove trailing whitespace
Merge remote-tracking branch 'upstream/master'