Merge branch 'issue-29' into 'issue-27'

closes #29, uses saref:hasIdentifier

See merge request !20