update todo
Merge branch 'devel'