fix on js
Merge branch 'master' of github.com:junereycasuga/emerge