Merge branch 'develop'
fix readme.md
fix readme.md
fix readme.md
Merge branch 'master' into develop

merge from maste v1.1.1