Initial checkin of my enhancements to the original version.