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