Timeout HOT-FIX
Merge pull request #1 from chorice/master

Timeout HOT-FIX