Homogenize timeout #258 
closed #258