need to export the `_' symbol
Merge branch 'master' into gh-pages