fix for singleton antipattern
Merge branch 'master' of github.com:mihai-chezan/xpress