Added configurable timeouts for #24