added time unit
Merge remote-tracking branch 'upstream/master'