Merge branch 'dev' of https://github.com/azazel7/Jinn into dev
Merge branch 'dev' of https://github.com/azazel7/Jinn into dev