Fixes #16, small issue with timestamp formatting