edited to be generic
Merge pull request #1 from smiller171/public

edited to be generic