Fix wrong date time
Merge branch 'fix-date-time-#5'