Merge branch 'issue-16' into integrated

2 jobs for integrated
in 35 seconds, using 0 compute credits, and was queued for 2 seconds