update README.md
Merge branch 'develop' into github-master