Merge branch 'release/0.6.1' into develop
Version 0.7.0; proper semver
Merge branch 'release/0.7.0'