Update README.md
Merged with branch master and resolved the conflicts.