Merge branch 'release-1.1'
Merge branch 'release-1.2'
change readme text
Merge branch 'fix-readme' into develop