Merge branch 'sadiq-review-fixes' into 'master'

Sadiq review fixes

Closes #20, #19, and #18

See merge request !29
2 jobs for master
in 4 minutes and 4 seconds, using 0.0 compute credits, and was queued for 3 seconds