Merge pull request #5 from digitalronin/master

enable a timeout option to be passed to the query method