Merge in timeout changes made in VLER-DAS-4.4.1 branch.
Merge pull request #54 from dvazquez1027/master

Merge in timeout changes made in VLER-DAS-4.4.1 branch.