Merge pull request #94 from ajstanley/7.x

fixed ds_comp
made subjects repeatable