Implemented shorter timeout with user feedback. That's enhancement Issue #4