0.7.0
Merge branch 'v0.7.0'