@carlw: great! I will check and merge when I get back tomorrow night unless @Ruckus or @thomasnield beats me to it :)