working on
MD updated
Merge branch 'todo_v1.1'