Merge branch 'release-1.1'
Bumped version to number 1.2
Fixed important issue #5
Merge branch 'hotfix-1.2' into next