Fixed two TODOs
Merge pull request #4 from ulsa/patch-3

Fixed two TODOs