Changed timerAuto
Changed timerAuto
Merge origin/master