Timer component updates
Merge pull request #1952 from flukeout/develop

Timer component updates