Hi Brett,

This patch looks good to me.
Could you please publish a snapshot jar including this fix so that I can run further test.

Thanks
Freeman