Update README.md
Merge remote-tracking branch 'upstream/master' into gh-pages

New stuff from original repo