Added some TODOs to the readme
Merge branch 'dev'