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

issue-12 changes.

Closes #12

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