pull request of github live changes to master into gh-pages