Fix dateformat issue (#20)