Merge pull request #39 from marc-hanheide/apache_proxy

I merge this myself, as it's only renaming things to work properly and only in this branch