Merge branch 'master' into develop
Change readme
Merge branch 'develop'