converted exisiting js to commonjs
Merge branch 'develop'