+тесты, рефаторинг
Merge branch 'master' of github.com:golyshevd/extend