few uncommitted changes
Merge branch 'master' of https://github.com/Joker-SMF/assist.js