Fixed and updated Rakefile