Hi!

Thanks for review.

Here is the updated patch.