removing the comment and the timeout parameter as discussed in #94