Refactoring collections support
Merge pull request #29 from scala/topic/collections-refactor

Refactoring collections support