reset added
Merge https://github.com/joepegler/timer