changed rakefile and movie.rb
 branch 'master' into mcarthur