Add interfaces to Timer class.
Merge branch 'master' into local master