Correction Index Out Of Bound
Merge branch 'master' of https://github.com/Kelvin-M/IMA-4508