Rails 4 compatability
Merge pull request #1 from balvig/patch-1

Rails 4 compatability