Feature/en 1831

Would be more flexible to take the timeout value, rather than just a boolean.