Merge pull request #514 from pornel/customtimeout

Ability to identify timeout errors