Jarv/add wait timeout