Try to fix #37
Merge pull request #38 from dizda/fix-timeout

Try to fix #37