Implement timeout handling - Timeout is set to 5secs (config?) - closes #2