So close and yet so far...
Merge branch 'master' of github.com:alcexhim/UniversalEditor
Updated TODO