Hello!
I finished the patch. I'm testing deeper, on W7 and Ubuntu.
I will probably send it tonight.
Thanks!