Merge branch 'gh-pages'
Added Jack :)
Merge branch 'master' into gh-pages