Merge branch 'master' into develop
update readme file
Merge branch 'develop'