Merge date formatting from pull request #90