Feature/configurable timeout

Made the timeout configurable and documented the fact.