Fixes #137.
Merge pull request #139 from frmwrk123/fix/JS

Fixes #137.
[ci skip]