change
Merge branch 'feature/browserify' into gh-pages