Version bumped from 0.7 to 1.0
Merge branch 'release-1.0'