Merge branch 'issue-27' into issue-22

2 jobs for issue-22
in 20 seconds, using 0 compute credits, and was queued for 55 seconds