Controller uberupdate
Merge branch 'master' of https://github.com/hen31/Containing