Bump version
Merge branch 'hotfix/0.2.18' into develop