merged the gh-pages version to master