Try to fix the unbound outp variable error
Merge branch 'maint'