Changed rake tasks
merging