fixed code without unnecessary array
Merge remote-tracking branch 'origin/master'