Added a few items to todo list
Merge branch 'master' into iridis