Bugfixes and proper logging
Merge branch 'refs/heads/fixes'
Tweak of the readme.md