Complete phase 2 hopefully
Merge pull request #102 from aw222fu/gh-pages

Complete phase 2 hopefully