Updates to allow module reuse via commonjs
Merge remote-tracking branch 'origin/master'