Fixed issue #5 and #7, deleted TODO.md.