Fix problem 7 to work with Browserify.
Merge branch 'master' into gh-pages