update TODO
Merge remote-tracking branch 'upstream/master'
tests for if-construct edge case
update TODO
Merge pull request #11 from mhurst4186/master

tests for if-construct edge case