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