modified README
modified TODO
Merge branch 'testing'