Merge pull request #16 from p2t2/DEV3.0.0

Dev3.0.0
Made collection library universe safe
Merge pull request #340 from apfeffer/DEV3.0.0

Dev3.0.0