minor fix, generalization
Merge pull request #82 from elliottcarlson/master

minor fix, generalization