Add getDate method
Merge origin/master
Add getDate method