Less broken dates
Merge pull request #16 from willtp87/modular

Less broken dates