More cleanup
Added back collection support.
Merge pull request #34 from joshaber/sets

Collection support