Implements #14
Fixes issue with proxy activation on runtime
Merge pull request #581 from emmanuel-keller/1.5

Implements #14