merge 7 functions into gh-pages