Amélioration #137
Fixed #136
Amélioration #104