Date formatting to solve issue #16