extend optional_timeout usage to deadline
Merge pull request #41 from chipdude/master

optional_timeout for deadline