Hi Zhenhua,

Your patch has been applied.  I refactored much of it afterwards :)  Let me 
know if I have broken something.

Regards,
-Denis