Merge pull request #109 from walmartlabs/collection-fixes

Collection fixes
Merge branch 'master' into collection-view