Add Scope class to generator
Merge pull request #120 from aderyabin/generator_fix

Add Scope class to generator