forgot this one
removed hidden character
Merge branch 'master' into gh-pages