Merge pull request #68 from freakboy3742/timer