Bundle cjs and esm

#### Fixes #193 #### Changes proposed in this pull request: Bundle both cjs and esm making a few changes as possible. #### Reviewers should focus on: Confirming the new bundle works in both cjs and esm projects.