Fixed time formating
Merge branch 'master' into debug