Revert "Merge pull request #1 from cinemania/master"

This reverts commit 6cd1728479e4f0e09fe52599c4e1da31d8837321, reversing
changes made to 13fb827e183cadf6603da56337ef53f448908a98.
Revert "Revert "Merge pull request #1 from cinemania/master""

This reverts commit 7ee823cafcc10d3b72157c350e66eb1cb8b42a39.