Adaptation of the data extraction to fit Cyril's requierments and correction of the non-ordered data bug (#15).