Fix and new TODO
Fix
Merge branch 'master' of github.com:AlexLeSang/ECOHT-ANN

Merge with new TODO