readme update
Update README.md
Update README.md
misc
Merge branch 'master' into gh-pages