Merge branch 'release/0.2.1' into develop
because I forgot version bump...
Merge branch 'release/0.2.2'