night hard commit
Merge branch 'master' of max-ural.tk:maxvas/jinn