Merge branch 'minusf-TED_code'