Bugfix 3
Merge branch 'release' into dev