timer added
Merge pull request #16 from sunnyLA4/master

timer added