1.5.0.19 dev

Hi Ecleese,

Not sure if you're interested in reviewing the changes I've made to your code.  If so, here you go. :)