Merge pull request #1 from hkxnyc/date_fixes

all finished