Fixed timer restarting bug.
Merge branch 'master' into deploy