added nsarray
Merge remote-tracking branch 'origin/master'
Added Genie
Merge remote-tracking branch 'origin/master'