améliorations diverses
merge