Fix JS Generator
Fix JS Generator
Fix conflicts in JS generator.
Merge pull request #32 from tetsurom/jsgen

Fix JS Generator