Rails 4

I changed it during development for my convenience, but it shouldn't have been merged like that