Adding todos
Merge pull request #29 from chdemko/master

Adding todos