Merge pull request #2 from Kafedra/master

a