This change allows easier monkey-patching in the client code. Fixed #156.
Merge branch 'master' of github.com:StratusLab/client