fix #181

* + some better log messages
Merge branch 'master' into experimental