fixed date issues
Merge pull request #183 from lexoyo/develop

Develop