My shizzle.
Added time formatting, complete.
Merge pull request #2 from charries96/master

t