stefanpenner Merge pull request #351 from senaev/set-timeout-using-zero