Syntax errors
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Update from NPellet
Merge pull request #8 from targos/gh-pages

Syntax errors