Merge pull request #319 from dhardy/generics

Generics