Merge pull request #7 from jamieleung/gh-pages

Merge branch 'master' into gh-pages
Update README.md
Merge branch 'gh-pages'
Merge pull request #8 from jamieleung/master

Merge gh-pages into master