Feature/en 1831

Please return an object, rather than an array. It makes it much easier for the caller.