Added ability to override timeouts if set in the options
Updated readme with new options
Incremented version
Merge pull request #10 from chriscantu/master

Added ability to override timeouts if set in the options Edit