Version bump
Merge branch 'release/0.2.1' into develop

* release/0.2.1:
  Version bump