small changes in js
Merge origin/master