Update README.md
Merged in conflicts with master