Merge pull request #50 from joviane/master

Rails 4 like a boss!