> I'm happy with the patch with those changes.

Thanks for the review. I have made the requested changes and will be 
committing the attached patch.

Sami