Fixes #1
Fixes #3
Fixes #4
Bump version
Update CHANGELOG
Merge branch 'release/0.2.1' into develop