Merge pull request #2 from wesleyks/feature/notimeout

Feature/notimeout