Merge branch 'issue-6' into 'develop-v2.1.1'

Imported SAREF and removed the declarations of its terms.

Closes #6

See merge request !3