Update README.md

Updated some README.md features
Merge branch 'master' into 2.1