Merge pull request #1 from hkxnyc/date_fixes

all finished
Merge pull request #2 from hkxnyc/master

Merge pull request #1 from hkxnyc/date_fixes