Update TODO
Merge pull request #5 from Necroped/patch-1

Update TODO
Update TODO
Merge pull request #6 from Necroped/patch-2

Update TODO