Data can be an array, not only object

Accept array as second argument IF third argument is an array as well
Merge branch 'develop'

* develop:
  Data can be an array, not only object