Changes that Gimelle & Lola made sent to Github.