#250 - updated todo tags
Merge branch 'master' into 250
Merge pull request #285 from krzyk/250

#285: pull request #250 - updated todo tags