Handle timer threads better.
Merge branch 'master' of https://github.com/jarrah-95/TOC19