Merge pull request #283 from krzyk/250

#283: pull request #250 created test and initial solution
#250 - updated todo tags
Merge branch 'master' into 250