Merge branch 'release/0.7.0' into develop
fixed merge conflict
bumped version
Merge branch 'release/0.7.1'