cleanup and fix for datetap
rebuilt
Merge pull request #21 from dotch/master

datetap fix