Improve error reporting of timeouts
Merge pull request #19 from jeffljones/master

Improve error reporting of timeouts