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

issue-16 changes.

Closes #16

See merge request !12
2 jobs for develop-v2.1.1
in 25 seconds, using 0 compute credits, and was queued for 9 seconds