Fixes and hurts!
Merge branch 'master' of https://github.com/FranciscoCanas/ActionMovie
synch