fix issue #13
add TODO list