subset test
Simpler subset generation
Reverted a silly change to the generator
Merge pull request #1 from lackita/master

subset test