Backported WS timeout per request

Original commit:
    ae14a0354d2fc406732f8fb2ce4fb5d40b33dbc0

Applied cleanly.
Update README.md