Improve timeout warnings
Merge pull request #15 from trainman419/timeout_warning

Improve timeout warnings