Added timer that starts when running.
Merge remote-tracking branch 'origin/master'