Added item to todo list
Merge branch 'master' into iridis