Merge branch 'develop'
v1.6 some fixes and gui
Merge branch 'master' into develop