adding client timeout option
Merge pull request #2 from natelaws/master

added timeout option