#21: Is that returning me a null collection
#21
closes#36
Merge pull request #61 from rhsu/issue36

closes#36
Merge branch 'master' into labels