Clear timeout on callback
Merge pull request #481 from nickdima/fix/client-clear-timeout

Clear timeout on callback