Merge pull request #1 from maximvarentsov/master

Master