Bumping to 1.1
Merging release-1.1 into develop