Better timeout
Merge branch 'better-timeout'