Merge pull request #80 from stweil/1.10.x

Fix documentation and messages (mostly typos)