Updated Rakefile
Updated Rake tasks