Set timer to update once per minute, changed from once per second
Merge remote-tracking branch 'origin'