missing curly fixes #358
Merge branch 'master' into gh-pages