edited TODO comments to reference new issues
Merge pull request #121 from yoavgurevich/issue20

Updated TODO Comments