Update README.md
Update readme and todo
Merge remote-tracking branch 'upstream/master'