superfeature implemented!
continue my branch
Merge branch 'superfeature'