Merge branch 'release/0.2.0' into develop
Merge branch 'master' into develop
Merge pull request #1 from potherca/develop

Merge branch 'release/0.2.0' into develop