Hotfix
More...
Merge branch 'hotfix-0.1.6.1'