ADD param to allow flexible timeouts
Merge pull request #3 from florianheinemann/flexible-timeouts

ADD param to allow flexible timeouts