optimized version
Merge branch 'master' of https://github.com/knil-sama/MyOwnMovieDatabase

merge