Fixed #78
Amélioration #36
Fixed bug #84