Fixed issue where stopping/resetting any timer would stop the timer.
Merge branch 'release/v1.1.1'

* release/v1.1.1:
  Fixed issue where stopping/resetting any timer would stop the timer.