Merge branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
make_array is now a template method
Merge pull request #6 from MarkaPola/feature/json_array

Feature/json array