adapt to local space conventions
Merge branch 'master' of github.com:psi46/pxar