Merge pull request #13 from nwre87/js

fixed object parsing
fixed conflicts
fixed merge conflicts with js
See what happens