Updating todo list
Merge branch 'develop'