Timer updates
Merge branch 'master' of github.com:xer0x/beginning