Including Tristan first PR changes and debug from DGtal