reviewed readme and todo
Merge branch 'ro_dev'