Fixed capacity check in collection classes
Removed repeated conditional check
Merge pull request #579 from hneuer/coll2

Fixed capacity check in collection classes
Merge pull request #580 from hneuer/pecond

Removed repeated conditional check