Feature/timeout2

@svmehta please check!