Merge pull request #22 from blackwithwhite666/master

Make timeout messages more verbose