Fixed #115
Amélioration #117
Minor change
Amélioration #89
Minor change
Fixed #118