added super_featuer in super-feature branch
Merge branch 'super-feature'