updated template and rakefile