Merge branch 'hotfix-0.2.5'
restored a duration in addition to the timer
restored a duration in addition to the timer
Bumped version number to 0.2.6
Merge branch 'hotfix-0.2.6' into develop