Fixed #187
Fixed #189
Amélioration #191