Merge branch 'issue-28' into 'issue-27'

closes #28: rely more on saref:consistsOf

See merge request !19