Bumped version number to 1.2
Merge branch 'release-1.0' into develop