Bugfixes
Merge branch 'develop'