Merge branch 'release/0.2.1' into develop
Merge pull request #72 from WikiLogic/develop

Merge branch 'release/0.2.1' into develop