modify rake
Merge 1