Add Support for CommonJS

Cool, I updated the PR to accommodate for this.