Merge branch 'release/0.0.2-dev' into develop
minor fixes
Merge branch 'develop'