Add timeout
Merge branch 'trytoadjusttimeout'