Merge branch 'release-1.0'
Bumped version to 1.2.0
Merge branch 'release-1.2'