Revert "Putting changes to master"

This reverts commit 97279f3e6eeb7a4e7c9d7a1b20ee4b8c619470cf.