Merge pull request #4 from adlpz/master

Improvements and refactorings
Only return collections in reader for homogeneity