Improved rakefile