Add changes by Jorge Lucangeli Obes to CHANGELOG
Add TODO items