datetime bug
Merge pull request #540 from Tendrid/develop

datetime bug