Avoid get_current_request where possible
Merge pull request #98 from housleyjk/master

Avoid get_current_request where possible