Merge pull request #72 from Mulavar/fix/timeout