Allow timeout values to be set
Merge branch 'feature-support-setting-timeouts'