improve date and time parsing
Merge branch 'master' of github.com:tempo/toolbox