Patch Set 4:

@Remy:
I've answered yours comments. Some of them I've already implement but I'll publish them after I handle all requests.

@Matthias:
If you don't mind I'll move your last comment to bugzilla and add my comments for things that you were pointing out.