Merge branch 'release/0.1.9' into develop
Bug fixes
Merge branch 'release/0.1.10'