Update README.md
merged branch master into master