Possibly fixed timeout issues
Merge pull request #1 from ags131/master

fixed intermittent timeout issues