Hi Gustavo,

This patch has been applied, but I refactored it heavily afterwards.
Can you make sure I didn't screw anything up?

Thanks,
-Denis