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

issue-8 changes

Closes #7

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