timer added
Merge pull request #15 from mike1729/master

timer was added