modif design classe
Merge origin/master