Fixed empty date
Merge Master