Hi,

Here's my updated patch based on the review.

Yit
January 11, 2012