fix #29: restore old namespace
Merge branch 'develop' into bug/solver-fix-props