JS update
Merge pull request #888 from mfalesni/js_update

JS update