partial getTime but it does not do two character time nor does it
change 60 into 1:00
Merge remote-tracking branch 'upstream/master'