Removing hard coded timeout. Closes #117

This pull request is not tested and is coded using the Github web GUI.
Merge pull request #118 from HNygard/patch-1

Removing hard coded timeout. Closes #117