Merge branch 'release/0.2.1'
Merge tag '0.2.1' into develop

* Release 0.2.1