Add support for other time formats

Close #3