Merge pull request #4 from kalimov/master

完成