Made Rakefile more flexible