Cldide 1781

@evoevodin @mshaposhnik  @skabashnyuk  Please, review my changes