collate and namespace fixes
Merge pull request #1 from lgatto/master

collate and namespace fixes