Better time formatting
Merge pull request #1 from woutertenbosch/master

Better time formatting