Merge branch 'release/1.1.0' into develop
fugafuga
update to 1.2.0
Merge branch 'release/1.2.0'