Timeout now works on client
Merge pull request #5 from rkophs/subbuffers

Timeout now works on client