Merge pull request #5 from jamieleung/master

Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
Merge pull request #6 from jamieleung/gh-pages

Merge gh-pages to Master