added and extended time delay
Merge branch 'master' into timeout-fix
Merge pull request #432 from scrollback/timeout-fix

Fixed few time-out issues