Final changes
Merge branch 'master' of github.com:ksmandersen/CCollections

# By Ulrik Damm
# Via Ulrik Damm
* 'master' of github.com:ksmandersen/CCollections:
  missing errors
  code cleanup