Merge pull request #1 from epam/master

Merge #168
Merge pull request #2 from epam/master

Require merge
Merge
Grunt fixed
Merge pull request #177 from larchanka/master

Merge pull request #1 from epam/master