Merge pull request #41 from ping19/master

Timer backbone