Accomplished TODO #47
Merge TODO.md