Keep input feature

I added feature that asked few days ago, please take a look and tell that is ok or anything needs to be changed.