Fixed bug in js-tools
Merge branch 'origin/master'