Commit by Isail, Arena, Snake are done
Merge origin/master