replace dictionary to array
Merge branch 'array'