Merge branch 'issue-19' into issue-7

2 jobs for issue-7
in 33 seconds, using 0 compute credits, and was queued for 2 seconds