add forced timeout
Merge branch 'master' of https://github.com/invisiblefriend/stir