Hello,

After the various comments, I have modified the patch.

What do you think ?

Thank You

Loïc