adding baseur and timeout options
Merge pull request #1 from glamb/feature/new_options_baseurl_timeout

adding baseur and timeout options