fixing NPE on adv. rewrite
increasing performance
Merge branch 'master' of github.com:outgrader/outgrader-proxy