Thanks for your review David, here is the updated patch.

--
Mathieu Lirzin