Edited
Merge branch 'master' of https://github.com/ThuF/ThuF.git into changes_branch_guest