sane timout time
Merge pull request #599 from teharrison/develop

sane timout time