Merge branch 'release/0.2.1' into develop
Bumped version to 0.2.2
Merge branch 'release/0.2.2'