lukas fix
Merge branch 'hack' of https://github.com/remynaps/containingController into hack
l