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