Fix timeout issue
Merge pull request #38 from mpath/fix_timeout_issue

Fix timeout issue