Improves handling of forwarded headers. Fix #2094

You did a great job with the docs. Thanks a lot!