Update timer to handle delete_on_complete
Merge pull request #636 from haripk/master

Update timer to handle delete_on_complete