Ok !

So I merge :)