Merge branch 'hotfix/0.2.17' into develop
Fix issue #5

It might fix...
Bump version
Merge branch 'hotfix/0.2.18'