fixed master
fixed carrierwave/fog
updated