Merge branch 'release/0.2.1' into develop
Updated changelog, version numbers.
Merge branch 'release/0.2.2'