fix toString
Merge branch 'feature/generic-collection-interfaces'