Update README.md
merge master