Merge pull request #1 from ricin123/master

1
33
Merge pull request #2 from kictpov/master

33