Update TODO
Merge pull request #567 from kigu/patch-2

Update TODO
Merge remote-tracking branch 'upstream/master' into Integration