Fix #96 - Ensure the timeout is there and allow specifying when making a request