Merge pull request #29 from epam/master

Merge #162
Merge pull request #166 from larchanka/master

Merge pull request #29 from epam/master