Merge pull request #2 from tbachcern/generics

Änderungen an generischen Typen
Merge branch 'master' into alternative_import