Fixes #9 - Follow date format changes