Merge pull request #34 from JustBlackBird/empty-array-fix