Merge branch 'issue-19' into issue-9

2 jobs for issue-9
in 30 seconds, using 0 compute credits, and was queued for 2 seconds