Merge pull request #46 from ovatsus/master

Small bug fixes & improvements
Improve error messages