Merge branch 'hotfix/0.1.7'
Bump version
Fix missed refactoring
Merge branch 'hotfix/0.1.8' into develop