Merge remote-tracking branch 'upstream/master'
Merge pull request #134 from EugeneGlushkov/master

Сделан rebase