Merge branch 'release/0.1.4' into develop
Fix issue with failing test
Bump version number
Merge branch 'release/0.1.5'