v0.2

Check first if there is a timer and return it

Acceptable API

Skip if statement since router handles it, a little bit inconsistency

but internally so it should be acceptable