Zhao had to do couple of refactoring and cleanup, and style modification, as per our last email conversation. @Zhao, if you are not planning to get to it any time soon. Do you mind If I take it over and do the refactoring(minor) and style changes myself. The patch is good enough to commit
Robin
