Enhance error logging and add `timeout` attribute
Merge pull request #2 from acm1/fixes

Enhance error logging and add `timeout` attribute