refactoring of collections
Merge branch 'master' of https://github.com/iyudincev/TrueTemplate