added timeouts
Merge branch 'master' of https://github.com/Toxoplasma/DSHW6