Preparing pull
Merge branch 'ThresholdOptimized' of https://github.com/plantener/CDIO into ThresholdOptimized