Merge pull request #2 from wesleyks/feature/notimeout

Feature/notimeout
Merge pull request #3 from wesleyks/master

Merge pull request #2 from wesleyks/feature/notimeout