Merge branch 'addDate'