Added TODO
Merge branch 'master' of github.com:zifeishan/emotif