Merge pull request #1150 from janstarzy:spelling