update readme, merge from gh-pages.