Merge branch 'issue-19' into issue-6

2 jobs for issue-6
in 34 seconds, using 0 compute credits, and was queued for 2 seconds