Fix #347 - "this" is now scoped correctly.  The return is now correct too (not an array of an array).