Fixed #182
Fixed #183
Fixed #184
Amélioration #185
Fixed #186