implement Comps and generatorExp
Merge branch 'dev'