Fixed typo pointed out by Jade
Merge branch 'master' into gh-pages