Merge pull request #5 from zebooka/master

Collections are refactored