Merge branch 'release/1.0' into develop
bug fix
ver up
Merge branch 'release/1.1'