change timer
Merge pull request #1 from rafty/cleanCode

change timer