merge timer
Merge pull request #3 from weolopez/timer

merge timer