Merge pull request #2 from forax/master

sync with forax/movie_buddy