Update for 0.7.0
Merge branch 'develop'