Merge pull request #9 from byeager/master

replaced TODOs with short but complete descriptions