feature/new-feature

This is a pull request
I don't like this new feature! Change it back!