Merge pull request #1 from GreenMiracle/master

merge
Мерж с грином
Merge pull request #2 from Rel-a-Tivist/master

Green merge