Merge branch 'issue-19' into issue-8

2 jobs for issue-8
in 26 seconds, using 0 compute credits, and was queued for 2 seconds