logging and timeouts
Merge pull request #2 from jasperstein/master

logging and timeouts