Generics start
Merge pull request #7 from D10221/Generics

Generics start