cleanup the uhgly, still don't understand pointers, huh wuh?
Merge branch 'master' of https://github.com/rdp/sensible-cinema