Fixed #1
Bumped version to 1.2
Merge branch 'release/1.2'