Fixed #123
Amélioration #126
Fixed #114
Fixed #129