Merge branch 'gh-pages' into master1
Merge pull request #1 from LaurieJS/master1

Merge branch 'gh-pages' into master1