added timeout fixes
Merge pull request #29 from olegshegula/olegsbranch

added timeout fixes