V0.6 small bugfixes
Merge branch 'entw'