updated TODO
Merge remote-tracking branch 'upstream/master' into relations
Merge remote-tracking branch 'upstream/master' into relations
Merge remote-tracking branch 'upstream/master' into relations
Added Controller stuff for my part
Merge pull request #6 from christianbermejo/controller

added Controller Stuff on my part