Fixed syntax error
Updating pages with changes from master

Merge branch 'master' into gh-pages