Merge pull request #1 from wagnert/master

Change from Apache specific REDIRECT_URL to generic REQUEST_URI
Merge pull request #2 from wagnert/master

Change from Apache specific REDIRECT_URL to generic REQUEST_URI