Fix request context dependency

Fixes #140
Merge pull request #141 from xsleonard/patch-1

Fix request context dependency