Thanks Martin,

Perfect. I will work on an updated patchset and get it in as soon as I can.

- John