Merge pull request #16 from epam/master

Update from upstream
Merge pull request #17 from epam/master

Update fro upstream
Merge pull request #18 from epam/master

Update from upstream
Merge pull request #19 from epam/master

Update from upstream
Merge pull request #196 from pukhalski/master

Sync