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

Merge branch 'master' into gh-pages