Improve doc and error messages
Merge pull request #78 from bsvensson/improve-doc-and-msgs

Improve doc and error messages