Ajout de types
Merge origin/master