Merge tag 'v0.1.18' into develop

1. Minor release
Fixing test
Fixing test
bump version
Merge branch 'release/v0.1.19'