Merge pull request #1 from epam/master

Merge #168