timeout issue
Merge pull request #398 from lingmingyb/timeout_issue

timeout issue