Fix update movie
Merge branch 'master' of github.com:Xiangxin/Merb

merge