Feature xff

Feature
* Merge X-Forwarded-For header patch