Idex 733

@evoevodin @mshaposhnik @gazarenkov @skabashnyuk Please, review my changes