Thanks Willem - Looks like I did issue a pull request against myself. I see the pull request I just issued is matched against yours.
Yes, it worked beautifully for us, we've been playing with it this afternoon a little. Thanks.
I think my comments here contain more bytes than my change. Who'd-a though ASCII could get so bloated...