finish fixing the bug
Merge branch 'master' of https://github.com/Drainet/SangoUnchained