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