Merge pull request #29 from epam/master

Merge #162