generic
Merge pull request #4 from blake41/master

Merged in genericization changes