Added timeouts
updated docs
Merge pull request #2 from nutrun/master

Added timeouts