Update README.md
Update README.md
Merge remote-tracking branch 'upstream/master'
Merged master fixed conflict.