Added source and rakefile changes