Adds clients specified timeouts to SOS requests
Merge pull request #190 from lukecampbell/timeouts

Adds clients specified timeouts to SOS requests