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