Exercice 1-10
fixed #2