Cleaned up code a little bit.
Merge branch 'master' of https://github.com/BurkeW/Timer