Merge pull request #24 from jerv13/master

Removed JS module dependencies due to broken includes.
Merge remote-tracking branch 'upstream/master'