Fixed bug with raising exception on timeout.
Merge branch 'master' of github.com:slipstream/SlipStreamClient