Merge pull request #2 from Panteleyev/master

Master