Fix typos
Merge pull request #1259 from ggreif/master

Typos