Update and fix arrays
Merge pull request #71 from S-Acar/patch-1

Update and fix arrays