Refactoring timers
Merge branch 'master' of github.com:OlliV/zeke