source created, rakefile updated
merge from source