(#105) moved resumable timer handling from flow to timer.
Merge branch 'feature/105-move-resume-feature-to-timer'