fix typos
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from alexisph/master

Fixed some typos