Update README
Merge branch master