Squashed commit of the following: Author: matis.mazingue <matis.mazingue@etu.uca.fr> Author: clfreville2 <clement.freville2@etu.uca.fr>
