added support for shorthand time formats, like 5h, and millisecond support. Fixes #2