Fixed empty collection bug as per #15
Merge pull request #16 from F21/master

Fixed #15