Merge pull request #490 from philippwiesemann/fix-typos-messages