Merge pull request #1 from MarkSuharev/master

Master
Merge pull request #2 from MarkSuharev/mark

Merge pull request #1 from MarkSuharev/master