Merge pull request #1 from angeldar/master

Совмещение
Уточнить
foo
Merge pull request #2 from Samael500/angeldar-master

Angeldar master