more generics
Merge pull request #287 from patriot1burke/master

generics