Added Generics For a couple things.
Merge pull request #3 from Themself1/master

Added Generics for a couple of things