final touches to make Collections work as Lists
style: fix nested else eclipse warning
Merge pull request #194 from BiovistaInc/master

Final fixes to make collections work as lists