added timeout query string parameter support
Merge branch 'timeout' into MedSentry