Fix conflict with Base.collect
Fix conflict with Base.norm
Merge pull request #11 from cdsousa/fixcollect

Fix conflict with Base.collect and Base.norm