Only return collections in reader for homogeneity
Fixed tests
Merge pull request #5 from adlpz/master

Only return collections in reader for homogeneity