Possibly issue fixed #15
Update TODO.md