(parser Research) merge with conforming OK
Merge branch 'master' of git@github.com:orcc/orc-apps.git