Modified TODO.
Modified Doxyfile.
Merge branch 'todo'