Update Makefile
Update Makefile
Update gh-pages update script
Merge branch 'master' into gh-pages
Update gh-pages