Rails 4 compatibility
Merge pull request #1 from rubydev/master

Rails 4 compatibility