Added timeout Bug #11