upped version to 1.1.0
Merge branch 'develop'