fix merge
Merge pull request #2 from SidelnikovYurii/master

Master