Fixed #21 (date format)