Merge branch 'release/0.7.0' into develop
Fix and change some upgrades. Fixes #1, #2.
Change versions.
Merge branch 'release/0.7.1'