todo comments
Merge pull request #1 from undeadcat/master

todo comments