Merge branch 'release/0.7.1' into develop
Fix index
Update version
Merge branch 'release/0.7.2'