Update README.md

Merging master into juliet