fixes timeout bug
Merge pull request #19 from featalion/timeout_fix

fixes timeout bug