merge change from gh-pages branch