addresses timeout
Merge pull request #104 from biversen21/develop

addresses timeout