Possibly issue fixed #15
Update TODO.md
Merge branch 'master' into gui