Fixed problem with dissapearing colon and timer breaking after 1 hour.
Merge remote-tracking branch 'origin/master' into Master