update readme, merge from gh-pages.
Merge branch 'master' into gh-pages