Bumped version number and updated CHANGELOG.md
Merge branch 'release/0.2.1' into develop