Merge branch 'release/0.0.1' into develop
Creating template
conflicts
version bump
Merge branch 'release/0.0.2'