Better formatting of the elpased time
Merge branch 'time-logging' into version-logging