fix language in several places
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from nuest/master

Typo and language updates