classes generation
merge commit