[Fix #114] allow duration for time limit (based on a String)
Merge branch 'feature-timer' into develop
Merge branch 'feature-timer' into develop