#11 also added support for longer time formats