Treat timeout differently than abort. Also added a string message to the timeout response.
Merge pull request #169 from tarekw/Handle-timeout

Treat timeout differently than abort. Also added a string message to the...