remove obsolete include, range syntax compatible with psi46test, misc fixes and improvements
Merge branch 'master' of github.com:psi46/pxar