Handle TODOs and commented code
Merge pull request #730 from elyezer/handle-todos

Handle TODOs and commented code