add timeouts
Merge branch 'master' of github.com:nrh/dadisk