Support for collection-helpers
Merge pull request #71 from zimme/master

Support for collection-helpers