timer added
Merge pull request #16 from guanlun/master

timer added