Move acknowledgment into README.
Fix timeout error detection.
Merge branch 'develop'