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

closes #7 and #17

Closes #7 and #17

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