Merge pull request #182 from maksimov/develop

:lipstick: Deprecation clean-up strikes again