Merge branch 'SEDI' of https://github.com/benyito/SEDI.git