new formatDate
Merge origin/master