IDEX-1413 & IDEUI-320
Merge pull request #10 from mihailkuznetsov/master

IDEX-1413 & IDEUI-320