Merge pull request #844 from ka7/feature/spelling