updated till v. 2.6
Merge pull request #1 from kolesa/master

fix for collections