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

Merge branch 'gh-pages'