improved js
improved js
improved js
Merge remote-tracking branch 'origin/master'