Feature/new feature

Time for PR