Merge pull request #121 from Dima73/timer