Fix issue #12 with date formatting