Merge branch 'release/1.1.0' into develop
fixing #36
Merge branch 'release/1.1.1'