Use browserify to compile correctly
Merge in master