Fixes bug where supplied option for timeout were ignored in constructor.
Merge pull request #66 from tim-massey/options

Fixes bug where supplied option for timeout was ignored in constructor.