Update README.md
merge master
trimmed code