fix for timeout error, timeout wasn't set if parameter not fed
Merge pull request #20 from freakhill/timeout-fix

fix for timeout error, timeout wasn't set if parameter not fed