Merge pull request #1842 from joshuaruesweg/typos