improved performance of collection and worset creation
Merge branch 'master' of https://github.com/catami/catami