Minor fixes in timer
Merge branch 'master' of https://github.com/SilverWhiskey/lab_07