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

issue-17 changes: imports and metadata

See merge request !11