Merge changes to gh-pages
Improving Makefile
Merge changes to gh-pages