Clean merge (hopefully *sigh*)
Merge branch 'master' of https://github.com/Boulotaur2024/gedosato