less retarded, more generic
Merge pull request #1 from pzurek/generic

less retarded, more generic