add timeout and connectTimeout options
Merge pull request #21 from EndangeredMassa/smassa/timeouts

add timeout and connectTimeout options