Cleand up a little bit.
Added a possible TODO
Merge branch 'master' of https://github.com/PFCM/Immanence