Cleaned up TODO.
Merge pull request #15 from PabloRomanH/master

Cleaned up TODO.