Some changes to Rakefile