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

issue 13 changes.

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