smartened things
Merge https://github.com/deadbear/palaisDuCinema