finer error reporting for timeouts and failures
Merge branch 'master' of https://github.com/dginev/CorTeX