Merge remote-tracking branch 'jaimeMF/TED'