Amélioration #128
Fixed #131, #133