update TODO to README
Merge branch 'develop'