Added timeout as a fix for issue #53