When you do start to work on this again; I have a slew of bug fixes and enhancements on my branch I would love to merge back into your master.