Trying to make it return something on match of array/object too (work in progress)
Merge remote-tracking branch 'origin/master'