Compatibility with forwarded requests
Merge pull request #1 from steverice/master

Compatibility with forwarded requests