Issue #35: update TODOs
Issue #32: update TODOs
Update README.md
Update README.md
Update README.md