Merge branch 'release-1.0' into develop
bumped version number
Merge branch 'release-1.1'