Per request timeouts
Merge pull request #2 from zerko/master

Per request timeouts