possible fix js
Merge branch 'dev' of https://github.com/4vpta/4vpta into dev