Syntax fix

I struggle with programming sometimes
Merge branch 'master' into gh-pages