Merge pull request #1632 from rzhxeo/cinemassacre