Configure read timeout based on wait parameter
#373
+86
−65
Merged