Update TODO.md
Merge pull request #18 from edsanz/master

Update TODO.md
Merge remote-tracking branch 'upstream/master'