Merge branch 'release-1.0' into develop
Fixed broken test
Merge branch 'fix-broken_test' into develop
Bumped version to 1.1
Merge branch 'release-1.1'