Add timeout for #47