Fix #35 - Problem with date and time.
Merge pull request #37 from vreixo/issue35

Fix #35 - Problem with date and time.