Rajarshi Guha - 2009-11-18

With Dazhi's suggestions, the bug is fixed. Fix has been pushed to 1.2.x on github