Merge branch 'gulpjs'
Fixed typo
Merge branch 'master' into gh-pages