trying to fix everything
Merge branch 'master' of https://github.com/S7012MY/Surse
fix everything