javascript refactor
Merge branch 'master' of github.com:maskrz/ZPI
Merge branch 'master' of github.com:maskrz/ZPI