Issue #24 added time_format