Adding further timeouts for hanging described in Issue #1