Version bumped to 1.6.1
Merge branch 'hotfix/1.6.1'