Merge pull request #119 from Dima73/timer