Merge branch 'release/0.1.6' into develop
handle existing branches
bumped version
Merge branch 'release/0.1.7'