Version bumped to 1.1
Merge branch 'release-1.1' into develop