#144 Better time format