Merge pull request #1 from futureimperfect/dev

Fixed a typo.
Merge pull request #2 from futureimperfect/dev

Fixed more typos.