Handle empty array
Merge pull request #161 from LearningLocker/develop

Handle empty array