Bugfix
Merge branch 'master' into develop
Bumped version to 1.6.1