Revert "Revert "Now it should work as it wok for me!""

This reverts commit 3bc066eae476ae304689bce21e20e96aff15c20a.
Revert "Shouldn't be released"

This reverts commit e4af2de72d14ea0ad4642c00c94bb052d5a9bc6a.