Amélioration #192
Amélioration #87
Fixed #196