Fix #35 - Problem with date and time.