#225 removed todo
Merge branch 'master' into 225
Merge pull request #238 from krzyk/225

#225 removed todo