Merge pull request #1431 from alex/fix-typos

Fixed a few typos