Refresh timer
Merge pull request #1008 from psav/refresh_timer

Refresh timer