fix for carrierwave
Merge pull request #163 from tehPlayer/master

fix for carrierwave