timer working
Merge pull request #23 from snowstorm/timer

timer working