Cleanup time parsing
Merge pull request #5 from anchor/wip-cleanup-time

Cleanup time parsing