commit with super-feature
Merge pull request #1 from megarocks/supernew_feature

This code is ok. Merge confirmed