Add Time Format as suggested in #2