Fixed typos.
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from riaanjutte/master

Fixed typos.