updated toDo
Merge branch 'master' of blag:notepost