Merge branch 'develop'
modified README
Merge branch 'master' into develop