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

Implements #14