Merge branch 'issue-32' into 'issue-22'

closes #32: define criticalobject as a feature kind, with narrower kinds

See merge request !25