Unfiy time parsing with timestamp parsing

Fixes #251.