Merge branch 'issue-19' into issue-12

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