IDEX-1667: update according to API changes
Merge branch 'master' into IDEX-1667
IDEX-1667: update according to API changes
IDEX-1667: add unit-tests
Merge pull request #52 from codenvy/IDEX-1667

IDEX-1667: update according to API changes