Bump version
Fix missed refactoring
Merge branch 'hotfix/0.1.8'