Fix the timeout exception
Merge pull request #18 from bhoflack/FIX_TIMEOUT

Fix the timeout exception