This should bring our changes back
Bumped version number to 1.1
Merge branch 'release-1.1'