Added option to configure the timeout. closes #21