Merge pull request #101 from jerv13/master

Clean up files add shim
Merge pull request #102 from jerv13/master

Remove console.log
Merge remote-tracking branch 'upstream/master'