optimize date time and rate
Merge remote-tracking branch 'origin/master'