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

closes #19 and #20

Closes #19 and #20

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