New module export pattern.
Merge branch 'master' into gh-pages
Should do at least something now.