bump version
Merge branch 'release/0.0.2' into develop
fix collisions
Merge branch 'release/0.0.3'