Reworked proxygenerator
Merge pull request #695 from Gravecorp/master

Reworked proxygenerator