Implemented my feature
Enhanced the feature
Merge branch 'feature/slava's_change' into develop