Fix TimeOut issue
Merge pull request #3 from berikv/patch-2

Fix TimeOut issue