adjusting rakefile
Merge branch 'staging'