Merge Luc and add french